mostly emacs
Merge branch 'master' of https://github.com/floatofmath/configs

Conflicts:
	deep-emacs.d/emacs.el