First shot in upgrading to Django 1.6