update
Merge branch 'master' of github.com:choppsv1/emacs.d

Conflicts:
	emacs-init.org