Merge pull request #433 from MG-RAST/master

master to develop
Merge pull request #3 from teharrison/master

master to develop
Merge branch 'develop' of github.com:teharrison/MG-RAST into develop
Merge pull request #4 from teharrison/develop

missed merges