Largish refactoring of .emacs.d
Merge remote-tracking branch 'refs/remotes/origin/emacs-update' into darwin

Conflicts:
	.emacs.d/paul.el