Skud/3000acres — pull request #1 by Skud (2014-05-01 12:39:11+00:00)
Title: Hotfix: mapbox

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