Updated emacs config as we need the latest evil package (otherwise M-x is not
recognized)
Merge branch 'master' of github.com:alexDarcy/dotfiles
Conflicts:
	emacs_cerfacs/.emacs

Also, separated vim for home and cerfacs, while there is only one emacs
installation now.