add study title for where samples in merged table come from
add dropped_samples to analysis object
start working on display of dropped samples
fix docstring, list comprehension for all_samples
Merge branch 'track-lost-samples-from-rarefaction' of https://github.com/squirrelo/qiita into track-lost-samples-from-rarefaction
Merge branch 'master' of github.com:biocore/qiita into track-lost-samples-from-rarefaction
Merge branch 'master' of github.com:biocore/qiita into track-lost-samples-from-rarefaction
Fixing issues with previous PR, removed a left > and adding wait method that was erased at some point in context.py
Adding comments and fixing pep8
adding get_study_fp
one single file upload
Add ontology object

Some methods/attributes probably still missing, but this is what we need for
EBI

Fixes #317
Merge pull request #354 from adamrp/ontology_object

Add ontology object
Merge pull request #351 from antgonza/track-lost-samples-from-rarefaction

Track lost samples from rarefaction
Merge pull request #352 from antgonza/one-single-upload

One single upload
Fixing merge conflicts