Upgrade to more than devise 2.1.2