Update
Merge branch 'master' of github.com:r2jitu/dotfiles

Conflicts:
	.vim/.netrwhist