Django 1.7

This also includes @sebslmoski's 1.6 work, I suggest merging the flake first.