revert em confusion
Merge branch 'add-units' of https://github.com/mapbox/mapbox-gl-style-spec into add-units