Merge branch 'develop' of github.com:MG-RAST/pipeline into develop
Merge branch 'develop' of github.com:teharrison/pipeline into develop
Merge branch 'develop' of github.com:MG-RAST/pipeline into develop
bug fixes
Merge pull request #299 from teharrison/develop

bug fixes