Merge branch 'master' of git://github.com/biocore/qiita into data-type
ENH: Add multiple data types selector to study
Fix missing template base.html -> sitebase.html

Fixes #98
ENH: Add command selection to GUI
Merge branch 'master' of git://github.com/biocore/qiita into webfleshout-the-revenge
add command to load study, also change StudyPerson.create to return object if Person exists
remove prints
Add samples to Analysis object
BUG: Pass analysis id as a hidden form
Merge branch 'master' of git://github.com/biocore/qiita into webfleshout-the-revenge
merge conflixs and other updates
tweak job commands
fix comand_id for exists and creation
STY: Fix PEP8 issues
MAINT: Improve .gitignore for VIM users

[ci skip]
Merge pull request #109 from ElDeveloper/gitignore

MAINT: Improve .gitignore for VIM users
Merge pull request #108 from squirrelo/jobtweaks

tweak job commands
Fixing issue 107
Merge branch 'master' of github.com:qiime/QiiTa into MetadataBug
DOC: Improve comments