updated .zshrc and .vimrc
Merge branch 'master' of github.com:tiwanari/dotfiles