Vim and ZSH
Merge branch 'master' of https://github.com/jasoncyu/dotfiles

Conflicts:
	.vimrc