Otros cambios
Merge branch 'master' of github.com:quiqueporta/dotfiles

Conflicts:
	vim/vimrc