Update submodules
Update subs
Fix fresh install
Merge branch 'master' of github.com:jlindsey/vim

Conflicts:
	vimrc
Update