Merge branch 'master' of git://github.com/mapnik/mapnik into conv_simplify
Merge branch 'expose_feature_style_processor' into conv_simplify
copy algorithm value when copying symbolizer
Merge branch 'master' into conv_simplify

Conflicts:
	include/mapnik/vertex_converters.hpp
Initial Travis CI configuration.
Added Travis CI badge to README.md
Do not use ccache
Do not install ccache and gain time on apt installations
Set JOBS=2 (best build time)
Merge branch 'conv_simplify' of git://github.com/kkaefer/mapnik into kkaefer-conv_simplify
+ make client methods non-static in classes derived from
  mapnik::singleton<> (TODO: apply to all)
+ ensure client methods are accessed through instance() method
Merge branch 'master' into conv_simplify

Conflicts:
	bindings/python/mapnik_markers_symbolizer.cpp
	plugins/input/ogr/ogr_index_featureset.cpp
	plugins/input/shape/dbfile.cpp
	plugins/input/shape/shapefile.hpp
	src/load_map.cpp
Merge branch 'master' into conv_simplify
+ zhao-saalfield intial impl (TODO: optimize)
Merge branch 'master' into conv_simplify
+ discard 'almost' adjacent vertices
+ enforce 'min_size' in output path
+ check sleve_cont has at least two vertices
Merge branch 'master' into conv_simplify
Merge branch 'master' into conv_simplify
Merge branch 'master' into conv_simplify