Commit corresponding to OTT 2.0
A working OTT 2.1, a few more changes yet to be done
Merge pull request #47 from OpenTreeOfLife/provenance-display

Restored edge-info hotspots. Added prompts for cryptic widgets.
study status controller and code formerly in the bitbucket avatol_nexsons repo
status app ported to web2py
finished status view
added example of the nexsonsdir configuration property required to enable the study/status controller
Merge pull request #48 from OpenTreeOfLife/pgloadindws

Pgloadindws
Handling simplified JSON from getSyntheticTree
Merge pull request #49 from OpenTreeOfLife/argus-performance

Handling simplified JSON from getSyntheticTree
Smarter edge styles, restored edge studies info.

We now distinguish between edges that are supported by taxonomy, phylogeny, or both. Also restoring study info (incl. full references) for edges that have them, even if they don't have a DOI in the reference.
Grouping and sorting of child nodes in argus

These display changes will support further clustering of less-interesting edges (supported only by taxonomy).
implemented LockPolicy and refactoring to use it
Update README.md

Added info about smasher and removed header formatting for MIT license at bottom.
more file lock hacks
modified study NexSON to html functions, but the controller is not using the new system
Merge branch 'master' into pgloadindws
finished the changes which should help keep the study/status pages from being a drain on web2py
Merge pull request #50 from OpenTreeOfLife/pgloadindws

Pgloadindws
turning down some of my verbosity