Plugin changes.
Merge branch 'master' of github.com:Natman64/vimfiles

Conflicts:
	.gitmodules