Don't resolve character contact with self
Add a version number
Only do combat with alive characters
Dead characters are passable
Merge pull request #22 from ksnavely/21-combat-fix

21 combat fix