Rolled back event event type association.
Merge branch 'master' of github.com:mcaples/clubhouse