replace {{token}} with {token}, and %d/%d/%d with {z}/{x}/{y}

refs https://github.com/mapbox/mapbox-gl-style-spec/pull/87
switch to GeoJSON-style geometry type names

refs https://github.com/mapbox/mapbox-gl-style-spec/pull/69
Merge branch 'master' into fuzz-pipe