Refactor diff calculation to facilitate more context

Create groups of diff chunks and context chunks.  In a subsequent
change we can use that to better control the displayed context.

Change-Id: I75858d002e9a9fff809c91cfced81c6022d86196