Fix diff match highlighting - closes #11
trim header and trailing space cleanup