mapnik c++ style
c++11 syntax
relax FeatureCollection grammar to allow arbitary key:value's
Merge branch 'master' of github.com:mapnik/mapnik into render-time-variables
tests for #2245