models json for testing, need to get some testing framework in here asap
Merge branch 'master' of https://github.com/stealthycoin/kaleidoscope