replaced simplejson with json
Merge pull request #33 from craigbruce/master

Replaced simplejson with json