evil vc-dir
Merge branch 'master' of github.com:jixiuf/emacs_conf

Conflicts:
	site-lisp/joseph/joseph-evil.el