Refactor and minor cleanups
Merge branch 'master' of git@github.com:mrdaemon/thegame.git