Merge branch 'master' of https://github.com/ryanbagwell/django-cas-provider into...