more protective script
Merge branch 'master' of github:yogsototh/vimrc

Conflicts:
	vimrc