Emacs: Misc.
Emacs: Misc.
Merge branch 'master' of https://github.com/crshd/etc

Conflicts:
	emacs/init.el
	emacs/user/completion.el
	emacs/user/modeline.el