config
Merge branch 'master' of git://github.com/artemp/vector-tile-server.git into origin
Merge remote-tracking branch 'origin/master' into origin
Merge remote-tracking branch 'origin/master' into origin
Merge remote-tracking branch 'origin/master' into origin
Merge branch 'master' of git://github.com/artemp/vector-tile-server.git into origin

Conflicts:
	osm_vectors.xml
fix polygon rendering
- remove wrong points introduced by clipping
- polygons are implicitly closed
- expand poly clipping rectangle
use Clipper instead of clip_poly
set polygon end marker
enable polygons with holes:
- changed agg_conv_clipper to encode whether a contour is an outer or inner ring
1*SEG_CLOSE for end of ring 2*SEG_CLOSE for end of polygon
the hack for building height until next revision of the protocol
Added mkdirp
Merge remote-tracking branch 'remotes/hjanetzek/origin'