devise appears to be working - need to verify via puts and rederection and lockouts
merge conflict