Merged in robberwick's commit for fixing the simplejson import issue.  decode_json function assumed simplejson module, and caused errors if json module loaded.