update oj, multi_json
json/oj cleanup, see #656
Merge branch 'master' into 656_fix_oj_errors
Merge pull request #658 from flapjack/656_fix_oj_errors

Fix oj errors