Slight improvements to our Travis-CI script.

Some Linux builds would fail because we were trying to use the maximum
number of virtual CPUs while we probably ought to use the maximum
number of physical CPUs.