Merge pull request #53 from actorquedeveloper/master

4.2.0 pbsdsh -h fix
Remove an include path that is invalid from the server files. Also add something to a scaffolding file that was missing and add -lgcov to a couple more LDFLAGS
Merge https://github.com/actorquedeveloper/torque
Merge pull request #55 from actorquedeveloper/master

master sync from actorquedeveloper
This places us 95% of the way there on unit tests working again. qstat still needs to be fixed, job_func has a bunch of undefined reference errors, and mom_comm has some cryptic failure. Everything is is working now.
resolve a merge conflict.
Merge https://github.com/actorquedeveloper/torque