Fixed merge conflict with geocoder in Gemfile.lock
fixed routing to just-created event
Merge branch 'user_login_tests'
include maps api key in hidden yml file
Initial Event integration test
Merge pull request #12 from JustAboutJeff/create_and_view_event

fixed routing to just-created event
hidden map api key now working, some styling for map div on event page
Merge pull request #13 from JustAboutJeff/create_event_test

Create event test
Merge pull request #14 from JustAboutJeff/maps

Maps
adds mailer functionality
fixed merge conflicts
adds html mailer view
fixes merge conflicts