Ensime upgrade
Merge branch 'master' of github.com:rajish/configs

Conflicts:
	.emacs.d/elpa/archives/melpa/archive-contents
New version of Ensime