updated vimrc.
Merge branch 'master' of https://github.com/natenoonen/LocalFiles

Conflicts:
	vimrc