initial configuration
initial devise version
Merge branch 'master' of https://github.com/MatthewBoyle/Cam-Era
coordinating changes with MB