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

Conflicts:
	vimrc