Fix a couple of integrity errors to be compatible with Django 1.6
Upgrade Django requirements to Django 1.6