update
Merge branch 'master' of github.com:maxmzkr/vimstuff

Conflicts:
	.vim/.netrwhist
	.vim/.netrwhist.orig
	.vim/.netrwhist~
	.vim/plugin/settings/vundle.vim
	.vim/plugin/settings/vundle.vim~