Initial checkin of ad hoc deployment script
Merge remote-tracking branch 'origin/master' into cloud
Further progress on automated install
Proper pagination for Trees list
Improved treemachine setup; use md5 to decide whether to re-fetch, and commit id to decide whether to recompile
Better web2py config file processing; other small changes
Merge pull request #109 from OpenTreeOfLife/cloud

Script for deployment on AWS
Merge pull request #110 from OpenTreeOfLife/ott23

OTT 2.3 intermediate commit, to get edits synced (in new place now)
fix mismatched quote marks
Change more quotes to make github happy
Initial support for read-only study view

I'm using a single view for this, but pivoting in the code (client- and server-side) for VIEW versus EDIT.
Adding client-side tests for Trees and OTU Mapping
Merge pull request #111 from OpenTreeOfLife/readonly-study-view

Initial support for read-only study view
Merge pull request #113 from OpenTreeOfLife/tree-and-mapping-tests

Adding client-side tests for Trees and OTU Mapping
Merge branch 'master' into simple-curation-app

Conflicts:
	curator/views/study/edit.html
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)