Update vim
Merge branch 'master' of git://github.com/brauliobo/gitconfig

Conflicts:
	configs/.vim