Remove diff-hl/magit hacks

diff-hl now tries to deal with Magit