Game model edits
Merge branch 'dev' of https://github.com/athurman/dungeon-crawl into dev