Misc.
Misc...
Merge branch 'master' of github.com:gneuvill/Emacs-Configuration

Conflicts:
	dist/elisp/ensime-git
	dist/elpa/archives/melpa/archive-contents
	user.el
my-ensime-git new commits
ensime-git new commits
Merge à Rennes 1