map stuff 2
Merge branch 'mapping' of https://github.com/houstongolden/civly into mapping