fix selector error; add gruntfile.js, etc
...
merge conflicts
mapbox-gl