squash to bedcfba0292dbafcd480325f2ec48321de24ab99
Update buildsystem for ejson

Need to move this back down to the other commits for build system
changes.