save before merge
merged
waiting on other pull requests
Solving merge conflicts
Finishing up function
Solving merge conflicts (2)
Merge branch 'master' of github.com:qiime/QiiTa into preproccesed
Adding tests
Cleaning up environment
changes before merge
changes before merge2
address comments
should be good
hopefully last one
merge with master
TST: Fix broken tests that got merged in #139

Sorry team!
Merge pull request #122 from teravest/preproccesed

Ready for MERGE:  Add command to import preprocessed data
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