Merge branch 'power-ups'
Flattened some of the __EventSource classes into their corresponding controllers

This doesn’t include PlayerEventSource/ControlEventSource/PlayerManager
yet.
Flattened PlayerEventSource and ControlEventSource into PlayerManager
Merge branch 'master' into power-ups