Update to Django 1.6 layout