Update to Django 1.7

Starting point for #122
thanks! updated