Minor improvements from Emacs Redux.
Upgrade magit to get magit-diff.