PEP8 fixes for cartography module
Merge pull request #575 from ajdawson/cartography-pep8

PEP8 fixes for cartography module