Companions die and the player ignores them now

woo
Merge branch 'master' of https://github.com/AstroTeam/Astro