made the top map on main page display geocoded events
Merge branch 'master' into mike/mappin_main
fixing merge conflicts
fixing merge ish
removed some recurring stuff
fixed the static pages controller
Merge pull request #23 from djmrr/mike/mappin_main

Mike/mappin main