save before merge
merged
waiting on other pull requests
Solving merge conflicts
Finishing up function
Solving merge conflicts (2)
Add get_processed_params_tables util
Merge branch 'master' of github.com:qiime/QiiTa into preproccesed
Merge branch 'master' of https://github.com/biocore/qiita into load_processed_data
Adding tests
Add load_processed_data command and tests
Cleaning up environment
Fix processed_filepath table

Allow multiple filepaths to be associated with each processed_data_id
Fix handling of preprocessed_data_id
Add second biom table to test
Add CLI support for passing processed_date
Uppercase portions of SQL commands
Remove prep_x and sample_y from the SQL export
Merge pull request #129 from adamrp/load_processed_data

Load processed data
changes before merge