update emacs config
Merge branch 'master' of github.com:trevorsenior/dotfiles

Conflicts:
	.emacs.d/my-conf/my-emacs-config.el