Added Vim configuration file
Merge branch 'master' of github.com:gbonfant/dotfiles

Conflicts:
	.vimrc
	init.sh