Fix #409
upstream master
fixing config error
fixing flake8
Merge branch 'master' of https://github.com/biocore/qiita into issue_409
adding @adamrp comments
fixing flake8 errors
ENH: Add new column for user defined ontologies
Merge pull request #574 from antgonza/issue_409

Fix #409
Merge pull request #577 from ElDeveloper/new-table

ENH: Add new column for user defined ontologies