Update vimrc (clean)
Merge branch 'master' of https://github.com/ChoiZ/Vim-config

Conflicts:
	vimrc