Django 1.7

Do not merge this pull request.

As with the other 1.7 upgrades, rolf deploys are tricky the first time and need some manual babysitting. Just give me a go/no go and let me merge it.