cleanup whitespace in json and js files
Merge branch 'master' into multiplot