add ability to specify benchmarks from a file

Created originally on Bitbucket by Michael Hudson-Doyle

Was already merged in Bitbucket before import, marked as merged by the import user

I also make the parsing of --benchmarks a little more forgiving.