Django 1.7

Don't merge this PR.

As usual with the 1.7 upgrades, give me a go/no go and let me merge it so I can babysit the Rolf deploys.