Upgrade to Devise 2.1.x