formatting
fixup benchmark build flags
benchmark: also need -lrt on linux
move make_unique out of std namespace and allow building with c++14 compilers
( -std=c++1y )
Add an example config file for cpp03-libstdcpp-x86_64-macosx.
Merge branch 'master' of github.com:mapnik/mapnik
Remove config example.
Merge branch 'master' of github.com:mapnik/mapnik into make_unique
attempt to fix compile on linux
Merge pull request #2270 from mapnik/make_unique

Fixes compile in c++11 mode
better namings + cleanup
fix unused parameter warnings
text symbilizer : add halo-opactity property (#2268)
add 'cairo' subdir
fix compilation warnings
allow external image data - refs #2002

Conflicts:
	include/mapnik/image_data.hpp
	tests/cpp_tests/image_io_test.cpp
fix miniz encoder - closes #1560
fix miniz inlining
remove libcurl dependency

Conflicts:
	plugins/input/osm/dataset_deliverer.cpp
	plugins/input/osm/osm.cpp
	plugins/input/osm/osm_datasource.cpp
	plugins/input/osm/test.cpp
webp reader: initialize WebPDecoderConfig

Conflicts:
	src/webp_reader.cpp