Merge pull request #473 from teharrison/develop

fix display of M5RNA in workbench
Merge branch 'develop' of github.com:MG-RAST/MG-RAST into develop
API: display proper error message when trying to view metagenomes still in pipeline
API: give error when invalid option combinations used