Update to Django 1.7

Update to use Django 1.7, including fixes for backwards compatibliity and other versions bumps.