cloudmade to mapbox test
Merge branch 'master' into openaid-dev

Conflicts:
	js/map.js
comment changes
fix homepage lightbox code
make activity filter option calls cache-able
Merge branch 'master' into openaid-dev
Merge branch 'openaid-dev' into openaid-staging
Merge branch 'openaid-staging' into openaid-production