Updating oh-my-zsh and vimpire.
Merge branch 'master' of https://github.com/TrevorS/dotfiles

Conflicts:
	.vim