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

Conflicts:
	curator/views/study/create.html
Improved list UI; proper test for leaf nodes
Cleanup and standardization of list displays
Right column changes with the chosen curation tab.
More cleanup of tabbed panels; example notes.
Initial test of modal popup (tree viewer)
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
Cleanup of study-list view, to match other lists
Merge branch 'master' into simple-curation-app

Conflicts:
	curator/static/css/default.css
Merge pull request #119 from OpenTreeOfLife/simple-curation-app

Improvements to layout, right column, and all list displays
Sidebar forms (inactive) to add trees and files

These need supporting logic on the server, but style and choreography are pretty good.
Works except for taxomachine build
UI for OTU-mapping feedback and label adjustments
Debian setup seems to work as well as ubuntu setup did
Working substitution logic for visible labels.
Merge pull request #120 from OpenTreeOfLife/simple-curation-app

Curation UI to add trees, files, streamline OTU mapping
New parameter specifying host that's running the neo4j databases; separate script for installing a neo4j database