Updated json, updated variables
Merge branch 'master' of https://github.com/jtfmumm/hckt