Add landuse=water to waterbody table
Fix incorrect "construction" type
Bump mapnik version to 2.2, carto version to 0.95
Use shield symbolizer to render places