vimrc: Add Vundle plugin
Merge branch 'master' of github.com:RomainGiraud/defix

Conflicts:
	.vimrc