Radically simply the map parsing logic
Merge pull request #596 from xzyfer/feat/map-parser-electic-boogaloo

Radically simply the map parser logic