fix some glitches introduced by banning bwscaling in npksum
Merge branch 'master' into npRmpi