Update vimrc file.
Merge branch 'master' of https://github.com/ramiro/dotfiles

Conflicts:
	vim/_vimrc