Updated vim for keyword completion.
Merge branch 'master' of https://github.com/masterka/vim

Conflicts:
	.vimrc