Prepare for cleanup/migration of old studies
Refactor for new message locations, move old ones.
Cleanup and error reporting for annotation msgs
Misc. updates for new annotation storage
Reconciling tree(s) upload and supporting files

This will require some fixes to import-tree response JSON, but now we
can basically handle multi-tree uploads from a single file.
Handle supporting files tied to multiple trees.
Merge branch 'master' into new-annotation-storage
Cleanup diagnostic chatter
Merge pull request #242 from OpenTreeOfLife/new-annotation-storage

Refactoring for new annotation-message structure and location