fix -Wshadow warning
remove uneeded semicolon
remove uneeded semicolon
avoid -Wshadow warning
replace boost::trim with faster internal trim - refs #1633
fix -Wshadow warning
fix -Wshadow warning
fix -Wshadow warning
fix -Wshadow warning
various fixes to includes to include what is used
pull in latest master
fixup includes
fix -Wshadow warning in geojson plugin
Merge branch 'master' of github.com:mapnik/mapnik into faster-compile