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
Remove forge and add warning for direct login page. Fix #273. Fix #141.
fix #253
Add linkify function to qiita_pet.util
Improve study display pages

Provides links to pubmed for pubmed articles, and mailto links for users
(e.g., PIs of studies and users with whom a study is shared)

Fixes #199 by adding these columns to the dataTables on the studies pages
flake8 fix
Add function to convert params dict to JSON

With parameters sort_keys=True and separators=(',', ':')

Fixes #242
Use new params_dict_to_json function
Add suggestions from @antgonza and @teravest
Merge pull request #299 from antgonza/fix_253

fix #253
update config with smtp settings
Merge pull request #300 from adamrp/issue-199

Issue 199
Merge pull request #301 from adamrp/issue-242

Add params_dict_to_json function
update user object to handle verification better
add create user and verify user capabilities