Home setup
Merge branch 'home'
Merge branch 'master' of github.com:Levenson/emacs-config
Merge branch 'master' of github.com:Levenson/emacs-config

Conflicts:
	.emacs
	.emacs-extended
	.gnus