Fix diff match highlighting - closes #11