new file:   completion/_node
new file:   completion/_nvm
modified:   zshrc
new file:   zsh-git-prompt/gitstatus.py
new file:   zsh-git-prompt/zshrc.sh
Merge remote-tracking branch 'origin/master'
renamed:    zsh-git-prompt/gitstatus.py -> git-prompt/gitstatus.py
renamed:    zsh-git-prompt/zshrc.sh -> git-prompt/zshrc.sh