Latest emacs config changes
Merge branch 'master' of github.com:robertromito/EmacsConfig

Conflicts:
	emacs-customizations.el