Merge pull request #73 from adaptivecomputing/4.2-dev

4.2 dev
Fixed a merge error.
Merge pull request #76 from adaptivecomputing/4.2-dev

4.2 dev
src/Makefile.am had an extra line in it that would not let
autogen.sh run correctly.
Fix for stray jobs not getting freed. TRQ-1624. This was
ported from 4.2-dev.
Merge pull request #78 from adaptivecomputing/master

Unit test fix