Hotfix: mapbox

Pulling across this branch as a hotfix to deploy before the cloudmade cutoff.