Adaptions to Django 1.6, cleanup imports