Allow remote build of taxomachine .jar file as workaround to taxomachine repo problem
Initial study-creation page (layout+JS for review)
Merge pull request #114 from OpenTreeOfLife/study-creation-ui

Initial study-creation page (layout+JS for review)
Passing token to fetch_study (for Github API)
Merge pull request #115 from OpenTreeOfLife/study-creation-ui

Passing token to fetch_study (for Github API)
Study creation via OTOL API, diagnostic JS

NOTE that the required "upstream" functionality is not yet provided in the OTOL API or in treemachine, but this should be enough information to jump-start implementation.
Removing Dryad-specific import option (by request)

I believe that we can still use the study's publication DOI to check for data in Dryad.
Merge pull request #116 from OpenTreeOfLife/study-creation-ui

Attempting study creation via OTOL API
Fix timing of neo4j stop; fix IP address logic
Merge pull request #117 from OpenTreeOfLife/cloud

Various changes to neo4j 'cloud' setup script
Improve the way we do git repo refreshes; disable /doc in apache
Merge remote-tracking branch 'origin/master' into cloud
Merge pull request #118 from OpenTreeOfLife/cloud3

Tweaks to deployment system
minor change to new study page
Merge branch 'master' of github.com:OpenTreeOfLife/opentree

Conflicts:
	curator/views/study/create.html
Allow localhost access to web2py admin pages

This lets admin folk use an SSH tunnel to see errors, etc.
Fix for fussy apache syntax
Another try at a tough robots.txt file
Merge branch 'master' into simple-curation-app

Conflicts:
	curator/static/css/default.css