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

diff --combined cas_provider/migrations/0002_auto_20140920_1644.py
index 6f3781c,5e50aef..244d5ae
--- 1/cas_provider/migrations/0002_auto_20140920_1644.py
--- 2/cas_provider/migrations/0002_auto_20140920_1644.py
+++ b/cas_provider/migrations/0002_auto_20140920_1644.py
@@@ -20,7 -20,7 +20,7 @@@ class Migration(migrations.Migration)
          migrations.AddField(
              model_name='proxygrantingticket',
              name='pgt',
 -            field=models.ForeignKey(to='cas_provider.ProxyGrantingTicket', null=True),
 +            field=models.ForeignKey(to='cas_provider.ProxyGrantingTicket', null=True, on_delete=models.CASCADE),
              preserve_default=True,
          ),
          migrations.AddField(
@@@ -32,7 -32,7 +32,7 @@@
          migrations.AddField(
              model_name='proxygrantingticket',
              name='user',
-             field=models.ForeignKey(default=0, verbose_name='user', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
 -            field=models.ForeignKey(verbose_name='user', to=settings.AUTH_USER_MODEL),
++            field=models.ForeignKey(verbose_name='user', to=settings.AUTH_USER_MODEL, on_delete=models.CASCADE),
              preserve_default=False,
          ),
      ]