Make a util.Diff add context before and after the diff

Also add some tests.

I now realize that its only used in the tests to check for equality of two strings, but I did the work so it's there for the future.