Return type 'pgmapcss_result': change geo to type geometry
expr-v2: Upgrade to current mapnik expr-v2 version

- after closing mapnik/mapnik#2140, mapnik/mapnik#2153, mapnik/mapnik#2156
Merge branch 'branch-0.6'