Theme diff-hl
Merge branch 'master' of github.com:bbatsov/zenburn-emacs