Remove CloudMade from sample app
Fixes issue #2
upstream sync
Merge branch 'master' into mxm