Remove notice from application layout
bump Rails version, remove unnecessary gem
finished up devise
Merge branch 'devise-end' into day2start

Conflicts:
	.gitignore
	Gemfile.lock
	app/controllers/application_controller.rb
	app/models/user.rb
	app/views/devise/confirmations/new.html.erb
	app/views/devise/mailer/confirmation_instructions.html.erb
	app/views/devise/mailer/reset_password_instructions.html.erb
	app/views/devise/mailer/unlock_instructions.html.erb
	app/views/devise/passwords/edit.html.erb
	app/views/devise/passwords/new.html.erb
	app/views/devise/registrations/edit.html.erb
	app/views/devise/registrations/new.html.erb
	app/views/devise/sessions/new.html.erb
	app/views/devise/unlocks/new.html.erb
	app/views/layouts/application.html.haml
	config/environments/development.rb
	config/initializers/devise.rb
	config/locales/devise.en.yml
	config/routes.rb
	db/schema.rb