remove uneeded include
fix relative paths in mapnik-config for fonts/plugins
Merge branch '2.3.x' of github.com:mapnik/mapnik into 2.3.x