vim keybindings
Merge branch 'master' of github.com:phreeza/dotfiles

Conflicts:
	.vim/.netrwhist