Updated to Django 1.7

(in progress)