Rework mapnik-geometry-type handling to always run for ver < 2.2.0

This is to allow getting back to track upstream carto version
See #67 and #52