Updated .gitignore to ignore RVM config files
Fix User model assumption that SSL is being used
Revert "Fix User model assumption that SSL is being used"

This reverts commit 9ab36f0898704490923907df2162e8213c85787f.
Merge branch 'stable' of github.com:redconfetti/canvas-lms into stable