Tweaks for setting make's -j option 

1) Allow -j to be directly set by developer without modifying versioned files
2) Introduce a "factor" variable to the automatic -j calculation.  It is multiplied by the number of detected CPUs.