cucumber test passes for viewing events + misc fixes
Merge branch 'master' of github.com:gragtah/ColgateCalendar

Conflicts:
	app/controllers/users_controller.rb
	app/views/home/home.html.haml
	db/schema.rb
	features/support/env.rb
	features/support/paths.rb
oops