Fixed events and probably other things
Merge branch 'master' of https://github.com/mrsonicblue/theaquanauts