Magit bindings and ignore .hi
encore-mode
Merge branch 'master' of https://github.com/EliasC/.emacs.d

Conflicts:
	site-lisp/encore-mode/encore-mode.el