Merge branch 'kevinburke-genericize-build'
use number of cores
tweaks
Merge branch 'master' into genericize-build