configuration
Merge branch 'emacs-live' of https://github.com/shadowlaw/emacs into emacs-live

Conflicts:
	.gitignore