Fixes #941.
Merge pull request #942 from thomasgriffin/master

Changes events to use on( eventType ). Fixes #941.