Merge pull request #255 from csmith/master

Initial work on highlight manager.
Push some event handling into ServerEventHandler.