Make sure to use that mysql gem.
Update Devise with new key.
Merge branch 'master' into deployment-system

Conflicts:
	config/initializers/devise.rb