Misc. changes
Merge branch 'master' of github.com:emallson/dotfiles

Conflicts:
	.zsh-update