Replacing Cloudmade basemap with OSM, & clean-up