Fixed a bunch of stuff with the json code and other test cases
Merge branch 'sp4.sc2.model-auto-complete' of github.com:projectcs13/sensor-cloud into sp4.sc2.model-auto-complete
fixed test cases once more