Some clerical changes. Remove two bits of commented out code, add a space.
Merge branch 'master' of https://github.com/adaptivecomputing/torque
Fix a compile error and a bunch of unit test issues.
Merge branch 'master' of https://github.com/adaptivecomputing/torque