fix up access token docs for Xcode
simplify OS X access token use
move std::erase_if => util::erase_if
don't initialize sources multiple times
fix includes
don't force Testing build on linux
[skip ci]
add enum class to unify parsing/stringification
fix errors
make gcc happy
fix font halo units
change halo-width/blur units

refs mapbox/mapbox-gl-style-spec#66
Merge branch 'master' into fuzz-pipe

Conflicts:
	test/test.gyp