Refactor study-import to functions for each method
Implement study import from TreeBASE or bare NeXML
Merge branch 'master' into study_import_options
Fix to match newest prepare_annotation() in peyotl
manually merged logic by Jim on study_import_options