Some consistency fixes.
Merge branch 'master' of github.com:team461WBI/website

Conflicts:
	app/controllers/events_controller.rb

Signed-off-by: Kristofer Rye <kristofer.rye@gmail.com>