Django 1.6 migration

Initial migration to Django 1.6