init
Merge branch 'master' of github.com:bluurn/myvimconf

Conflicts:
	.vim/.netrwhist