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
Merge pull request #122 from teravest/preproccesed

Ready for MERGE:  Add command to import preprocessed data