updated vimrc
Merge branch 'master' of github.com:gokulvanan/SetupScripts

Conflicts:
	config/.vimrc