unit and integration tests complete.  Qualification tests written,
but need work.
changes to split out buildbot tests into unit, int, and qual
all tests passing.  Need to finish up tests for startup parameters.
Merge pull request #43 from unwin/master

fix for Jamie's buildbot issues
Merge remote-tracking branch 'upstream/master'