minor changes
Merge branch 'master' of github.com:ariannasavant/rails4_auth_tested