fix a bunch of bugs, compile both vms at the same time
Merge branch 'master' of github.com:fwilliams/ncm