improved JSON parsing so that an int that JsonCpp thought was a double can still be extracted as an int
Merge branch 'master' of github.com:datacratic/soa
Merge branch 'master' into sched-exp