Update vimrc
Merge branch 'master' of https://github.com/oskeep/vim-set

Conflicts:
	.netrwhist
	default.vimrc