update
Merge branch 'master' of github.com:iwag/dotfiles

Conflicts:
	home/.zshrc_all