Updates to vim
Merge branch 'master' of https://github.com/uolot/uolot-vimconfig

Conflicts:
	vimrc