wip
Merge branch 'master' of github.com:Babazka/myvim

Conflicts:
	vimrc