turning on validation again
coercion of POST response not needed
outsourcing more to peyotl
more farming out to peyotl
using peyotl to generate empty JSON
refactoring auth
Refactor study-import to functions for each method
removing unecessary traceback call
Implement study import from TreeBASE or bare NeXML
Merge branch 'master' into study_import_options
Fix to match newest prepare_annotation() in peyotl
tests failing for lack of sha arg
Refactoring for latest peytol local

Now need to have a valid SHA in
your testing conf to make the
ws-tests work.
broken commit pull does not equal pull
removing dangerous merge controller
broken pull now a broken merge
merge controller should work, but untested.
Merge branch 'master' into local-dep
manually merged logic by Jim on study_import_options
bug fix revealed by test script written by @snacktavish