consolidate functions to only use stops

refs mapbox/mapbox-gl-style-spec#96
remove stops from demo stylesheet