Added geocoder gemfile to app
Created rake task for events to update locations with geocoder
Added search and currentPosition with geocoder
Fixed merged conflicts events controller, model and index view.