undo changes from previous big fix attemp
Add new config for devise key
Merge pull request #12 from Spitigala/development

Development