In assembling svn diffs, there were a few lurking places where unicode objects

could slip into the list of lines (the rest of which were bytes), causing the

whole thing to try to coerce when joining. This fixes up the ones I could

identify.

Ran unit tests.