zsh vcs_info added
Merge branch 'master' of https://github.com/rsil/dotfiles