Changes to devise
devise merge conflict fix
Commented out session code, and helpers.