Brought a bunch of stuff up-to-date
Merge branch 'master' of github.com:rhythmx/emacs-config

Conflicts:
	EmacsInit.org