Merge branch 'mapbox' into gh-pages

Lol doin’ it live