Changes to Devise; mainly bootstrapping