modules changes
Vim-related changes.
Merge branch 'master' of https://github.com/benol/dot-files

Conflicts:
	.vimrc