Merge branch 'master' of https://github.com/biocore/qiita into ebi-issue-314
Merge branch 'ebi-issue-314' of github.com:adamrp/qiita into adamrps-ebi-issue-314