A little cleanup. Update modules.
Merge branch 'master' into osx

Conflicts:
	.vimrc