Support for core changes.
Merge pull request #198 from csmith/master

Support for core changes.
Merge pull request #199 from greboid/tidying2

Make events use User.
Fix AwayLabel.