added diff-hl
Merge branch 'master' of github.com:tsolar/emacs