Remove spurious output comparisons for logged errors.

Timeout error showing up in log before the 'client has newer' error.
Ignore buildout artifacts.
Sprinkle magic fairy sleep powder on racy test.
Merge master.