Upgrade to Devise 2.2.x