Clean up specs
Merge branch 'master' of github.com:gSchool/g2-event-manager
Break out a partial