WIP: Upgrade to Django 1.7