Added update/upgrade alias
Merge branch 'master' of github.com:loadstar81/dotfiles

Conflicts:
	zsh/zshrc