Don't use simplejson
Merge branch 'master' of github.com:kmorrison/caltech