ditch using json and just use js
Merge branch 'gh-pages'