correct return type from std::string::substr
integrate various minor c++ style and cast fixes into master from c++11 branch
optimize expression evaluation of text by avoiding extra copy
update changelog after 1dd1275
optimized WKTReader for parsing WKT into geometry paths
update changelog
viewer: leverage mapnik-config --cxx for QMAKE_CXX and QMAKE_LINK
merge with master
re-enable miniz
merge