Merge branch 'raw_json' of https://github.com/lamflam/simplejson into lamflam-raw_json