Add vcs_info feature
Merge branch 'master' of github.com:curipha/dotfiles

Conflicts:
	zshrc