Merge branch 'master' of github.com:qiime/American-Gut into rc1
Merge branch 'rc1' of https://github.com/wasade/American-Gut into bloom_modifications