mapnik-omnivore update
Merge branch 'master' of github.com:mapbox/tm2
mapnik-test-data update
merge with master