consolidate functions to only use stops

refs mapbox/mapbox-gl-style-spec#96
remove stops from demo stylesheet
Merge branch 'master' into fuzz-pipe

Conflicts:
	src/style/style_parser.cpp
update test fixtures