Yet another round for mapnik-geometry-type handling

This commit:

 - Fixes the testsuite
 - Also convert for sources in the ~2.1.1 range.

See #67 and #52