Fixing numerous JSON syntax bugs
Merge branch 'master' into gh-pages