Updated zshrc
Merge branch 'master' of https://www.github.com/argwhar/dotfiles
Merge