A lot of map updates and fixes. Just need to finish off some ctag bullshit, then it should be good to go.
Final fixes.
Merge pull request #59 from Glloyd/Mapping

Mapping