Make it pass all the unit tests again
Merge branch 'david-ticket1010-unittests' of https://github.com/david415/tahoe-lafs into david-ticket1010-unittests