Merge pull request #718 from antgonza/vamps-db-changes

Initial db changes for vamps
Fixing travis: miniconda fix credit to @ElDeveloper
Merge pull request #723 from josenavas/travis

Fixing travis: miniconda fix credit to @ElDeveloper
Merge branch 'master' of https://github.com/biocore/qiita into vamps-button
addressing @wasade initial comments