add better expansion when in slime
update safe themes in custom.el
Merge branch 'master' of github.com:kisom/personal.el

Conflicts:
	common-lisp.el
	custom.el