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
ENH: Fix non-existant method
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