Removing the empty, unused models.py to make sure South doesn't barf with south.exceptions.NoMigrations
Try to import json before importing django.utils.simplejson
Merge remote-tracking branch 'erikvanzijst/master'