Update vimrc.
Merge branch 'master' of github.com:aakpat6/vimfiles

Conflicts:
	vimrc