expanded on/off event hooks to support multiple concurrent listeners
Merge branch 'master' of github.com:agoodman/serviceable-ti