simplejson removed from Django, now used directly from Python

Just did this upgrade to meet basic 1.7 requirements.

Tests still not running well under 1.7