magit has good diff colouring now, so remove diff-mode-