data update
vim hist file
Merge branch 'master' of bitbucket.org:wezegege/config

Conflicts:
	config/vim/.netrwhist