Push some event handling into ServerEventHandler.
Merge pull request #256 from csmith/master

Push some event handling into ServerEventHandler.