Merge branch 'master' into source-raster
Merge branch 'master' of github.com:mapbox/tm2 into source-raster
update mapnik-omnivore
Merge branch 'master' into source-raster
Merge branch 'source-raster' of github.com:mapbox/tm2 into source-raster