Remove dependency on simplejson; convert everything over to using the json module in the python standard library.
Merge.
One more simplejson/json fix that slipped through the merge.