TST: Fix broken tests that got merged in #139

Sorry team!
Merge branch 'master' of git://github.com/biocore/qiita into creating-a-user-for-the-demo-that-curtis-is-presenting-on-monday-at-the-NIH-meeting

Conflicts:
	qiita_db/test/test_setup.py
Modifying the code so it copies directories
test_add_results_tar -> test_add_results_dir
Fixing type
ENH: Fix non-existant method
Fixing another tests
Merge pull request #142 from ElDeveloper/creating-a-user-for-the-demo-that-curtis-is-presenting-on-monday-at-the-NIH-meeting

TST: Fix broken tests that got merged in #139
+1 test
+1 test
All tests passing
download and add data to cannabis study
Merge branch 'master' of github.com:qiime/QiiTa into jobissue
Fixing setup.py
Adding study_processed_table
copy demo data over test data
fixing test
making drop_demo_env work
Merge pull request #143 from josenavas/jobissue

Job issue
fix except