Merge pull request #553 from MG-RAST/develop

merged updates
Merge branch 'master' into shock