Allow individual files of optional tests to be specified. Updated README.md
Merge branch 'for_buildout'