all changes to .vimrc done at work
Merge branch 'work'

Conflicts:
	.vimrc