make diff highlighting useful
Merge pull request #22 from greggroth/greggroth/improved-diff-highlighting

make diff highlighting useful