Remove type vectors
Improve style
Switch to v0.2.1 of eventsystem
Merge branch 'eventsystem-v0.2.1'