rake limit hit, try again later
map working but hitting api limit
merge conflics solved
Merge pull request #38 from red-admirals-2014/multi_marker

Multi marker
Merge branch 'master' into cron_job
Making sure newest map changes don't break everything.