Updated .gitignore to ignore RVM config files
Fix User model assumption that SSL is being used
Merge branch 'stable' of github.com:redconfetti/canvas-lms into stable