events controller
fix merge conflicts from design
Merge branch 'auth_allen' of https://github.com/thomasstephane/eventoverflow

Conflicts only captions and duplicated lines, mostly from the design update:
	app/controllers/events_controller.rb
	app/views/users/_signup.html.erb
	app/views/users/show.html.erb