Replace mapnik-geometry-type with mapnik::geometry_type in default styles
Update carto to 0.9.5-cdb1, closer to upstream (#52)