catchup
Merge branch 'gazetteer' of https://github.com/mapbox/mapbox-studio into gazetteer
rolled back some changes
Merge branch 'gazetteer' of https://github.com/mapbox/mapbox-studio into gazetteer