add slime
Merge branch 'master' of https://github.com/xlgwr/.emacs.d.yas.auto

Conflicts:
	ac-comphist.dat
	eshell/history
	eshell/lastdir