Fix Import Errors with Django 1.6