Simplified map topology
Merge branch 'master' of https://github.com/GameJam/thegrid