StrBuf -> String, and a minor fix-up.

StrBuf was renamed to String.
.read_to_str() now returns String rather than &str