upgrade to json 1.7.7
adjust so that the library is multi
Merge remote-tracking branch 'heroku-staging/master'