before merge form master
Merge branch 'master' of https://github.com/biocore/qiita into loadontology
downloads and loads ontologies and controlled vocab
Merge branch 'master' of https://github.com/biocore/qiita into loadontology
undo util changes
address @adamrp comments
address @antgonza comments
Merge pull request #295 from teravest/loadontology

Load ontologies and controlled vocabs on make_envs