Some more information about setting up integration tests, and some fixes to a few tests.
Merge remote-tracking branch 'origin/master' into setuptests
Merge pull request #84 from samwilson/setuptests

Some more information about setting up integration tests