Added oh-my-zsh plugin "vagrant"
Added git alias "br" to "branch"
Merge branch 'master' of https://github.com/twolights/meowrc

Conflicts:
	.zshrc