Remove unused code, update mapnik and geojson-mapnikify