Attempt to cover first transition issue
Merge branch 'master' of github.com:Magikhead/Disastronauts
Fix merge issues