updates
Merge branch 'master' of github.com:sjoeboo/dotfiles.new

Conflicts:
	.vim/.vim/.netrwhist