Start term-mode in Emacs state
Key for splitting a buffer
Don't start yasnippet in ansi-term
Merge branch 'master' of github.com:kluge/emacs.d

Conflicts:
	config/kluge-evil.el
		- no actual conflict