Additional Django 1.6 tweaks (update simplejson to json)