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

Conflicts:
americangut/generate_otu_signifigance_tables.py
scripts/generate_otu_signifigance_tables_AGP.py
tests/test_generate_otu_signifigance.py
tests/test_make_phyla_plots_AGP.py

Resolves conflicts