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
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