adding new functionality, should be ready for all but need to test meta-analysis
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
removing print
addressing @wasade and @adamrp comments
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
Merge branch 'master' of https://github.com/biocore/qiita into issue_487
fixing issues created from upstream master
fixing more issues
adding a print to see why it is failing
adding uploads to setup.py
specify file vs. folder
fixing final issues and changing name of main function
Change ENA ontology to ENA_test in populate.sql
fixing unicode error
Default to load ontologies, needed for interface

But do not load ontologies in travis, since they are not needed for general
testing
Add _investigation_type_ontology to PrepTemplate

This allows for testing with alternative ontologies (required when using
a test environment and --load-ontologies is passed to `qiita_env make`)
flake8 fix
Merge pull request #592 from josenavas/unicode-literals

fixing unicode error
Add comment explaining instantiaion in classmethod
Merge pull request #584 from antgonza/issue_487

BLOCKER: Issue 487