hopefully fixing auth
Merge pull request #475 from hacken-in/fixing-devise

hopefully fixing auth
Merge pull request #476 from hacken-in/master

devise fixing