Better event names
fuck it
Merge branch 'master' of https://github.com/bbohrer/waterboard