Upgrading to Django 1.7
Merging master branch.