Don't let characters stand on each other.

Also, update TODO
Merge branch 'master' of github.com:Qu4Z/SpaceRogue