changed zshrc
Merge branch 'master' of github.com:popkirby/dotfiles
fix conflict.