Updates from work
Merge branch 'master' of https://github.com/R4zzM/vim-config

Conflicts:
	vimrc