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
Improve docstring on load_raw_data_cmd

Adds parameter descriptions and a Returns section
Rearrange order of imports for PEP8 compliance

Fixes #133
Merge pull request #137 from adamrp/issue-126

Improve docstring on load_raw_data_cmd
Merge pull request #138 from adamrp/issue-133

Rearrange order of imports for PEP8 compliance
address comments
should be good
TST: Create a new user for demos

usr: demo@microbio.me
pass: password
Merge pull request #139 from ElDeveloper/creating-a-user-for-the-demo-that-curtis-is-presenting-on-monday-at-the-NIH-meeting

TST: Create a new user for demos
Merge branch 'master' of github.com:biocore/qiita into moreweb