Update vimrc
Merge commit 'c542914498c7c2563e2e1f3e4c80e41fc41cd621'

Conflicts:
	vimrc