temp
Merge branch 'master' of git://github.com/mjbp/editor
First semblance of event handling