vimrc
Merge branch 'master' of https://github.com/dni/dotfiles

Conflicts:
	vim/.vimrc