add virtualenv to zshrc
add setting for virtualenv to zshenv
remove for merge
Merge branch 'master' of https://github.com/moc-yuto/dotfiles
fix conflict
fix conflict2
zsh for git
Merge pull request #2 from moc-yuto/develop

Develop