updates
Merge branch 'master' of github.com:cycojesus/emacs.d-reboot

Conflicts:
	emacs-custom.el
	saved-packages