update imports

pandora/user/models.py

@@ -7,7 +7,8 @@ from django.contrib.auth.models import User, Group
 from django.db import models
 from django.db.models import Max
 from django.conf import settings
-from django.contrib.gis.utils import GeoIP
+from django.contrib.gis.geoip import GeoIP
+
 
 import ox
 from ox.django.fields import DictField

pandora/user/views.py

@@ -3,10 +3,10 @@
 import random
 random.seed()
 import re
+import json
 
 from django.contrib.auth import authenticate, login, logout
 from django.template import RequestContext, loader
-from django.utils import simplejson as json
 from django.conf import settings
 from django.core.mail import send_mail, BadHeaderError, EmailMessage
 from django.shortcuts import redirect