Merge pull request #10 from Aurorastation/development

Prep for Map
Map Fix

Makes the thing fully compileable. Adjustments and missing things to be
sorted out over the next three days.
Merge pull request #296 from skull132/development

Map Compatibility