Update diff-hl and make helm VC integration nicer