Cosmetic update to the way magit highlights diffs.
Merge branch 'emacs-update' into darwin