Bind hippie-expand to Command+/ as well
Add diff-hl package
Merge branch 'master' of https://github.com/bbatsov/prelude