Add diff-hl package
Merge branch 'master' of github.com:bbatsov/prelude

Conflicts:
	core/prelude-editor.el