Ran isort and fixed some post merging issues

backend/core/admin.py

-from django import forms
 from django.contrib import admin
-from django.contrib.auth.admin import UserAdmin as BaseUserAdmin
-from django.contrib.auth.forms import ReadOnlyPasswordHashField
+from django.contrib.auth.models import Group
 
-from core.models import (Feedback, Reviewer, Student, Submission,
+from core.models import (ExamType, Feedback, Reviewer, Student, Submission,
                          SubmissionType, Test, Tutor, UserAccount)
 
 # Stuff we needwant

backend/core/migrations/0002_auto_20171110_1612.py

@@ -4,8 +4,8 @@ from __future__ import unicode_literals
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
-from django.db import migrations, models
 import django.utils.timezone
+from django.db import migrations, models
 
 
 class Migration(migrations.Migration):

backend/core/serializers.py

@@ -2,6 +2,7 @@ from rest_framework import serializers
 
 from core.models import ExamType, Feedback, Student, Submission
 
+
 class ExamSerializer(serializers.ModelSerializer):
 
     class Meta:

backend/core/views.py

@@ -32,5 +32,3 @@ class FeedbackApiView(RetrieveAPIView):
     def get_queryset(self):
         return [submission.feedback for submission in self.request.user.submissions]
     serializer_class = FeedbackSerializer
-
-

backend/delbert.py

 import argparse
 import csv
+import json
 import os
-os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'grady.settings')
 import secrets
 import sys
-import json
 
 import django
-django.setup()
-
 from django.contrib.auth.models import User
 
-from core.models import Student, Submission
 import util.importer
+from core.models import Student, Submission
+
+os.environ.setdefault('DJANGO_SETTINGS_MODULE', 'grady.settings')
+
+django.setup()
+
+
 
 def parseme():
     parser      = argparse.ArgumentParser()