Some changes
Merge branch 'master' of https://github.com/kovagoz/vim

Conflicts:
	vimrc