Merge branch 'master' of github.com:fvillegas/vim

* 'master' of github.com:fvillegas/vim:

Conflicts:
	.gitmodules
Merge branch 'master' of github.com:fvillegas/vim

* 'master' of github.com:fvillegas/vim: