Vim
Merge branch 'master' of https://github.com/robenkleene/Dotfiles

Conflicts:
	vimrc