MapBox -> Mapbox

@incanus can you review this? Commit looks funky (9002 additions/deletions?)