Add better matching.
Merge branch 'master' of github.com:LDavRoe/vimsettings

Conflicts:
	vimrc