Merge branch 'refactor' of https://github.com/robb/Cartography into refactor
Merge branch 'refactor' of https://github.com/PiersonBro/Cartography into refactor