More vim fun
Merge branch 'master' of https://github.com/wgriffiths/dotfiles

Conflicts:
	zsh/aliases