replaced zsh-git-prompt with zsh-vcs-prompt
Merge remote-tracking branch 'origin/master'