cleaned up the code a bit
Merge branch 'master' of https://github.com/mcaples/clubhouse

Conflicts:
	app/views/events/_event_details.html.erb