Add bin/diff-highlight
Merge branch 'master' into work-separate-boxen