work on json a little, other tweaking
Merge branch 'master' of github.com:processing/processing