seperate devise branch

Pull request for changes on devise.