Gross pull-hack fixed
Merge branch 'master' of https://github.com/neilconway/concurrent-editing
code clean up
more cleanup