Refactored a bunch of stuff and other stuff
Merge branch 'master' of https://github.com/ttaylorr/maps-mmo