Hotfix: Mapbox

Apply mapbox branch as a hotfix to meet the cloudmade shutdown deadline