work changes
Merge branch 'master' of github.com:mbarnett/dotfiles

Conflicts:
	emacs.d/init.el
	zshrc
Merge branch 'master' of github.com:mbarnett/dotfiles