[fix] sync to master
Merge branch 'master' of https://github.com/martyn/dvorak-conf

* 'master' of https://github.com/martyn/dvorak-conf:
  [bug] bump vim
  [refactor] fix several key binding issues

Conflicts:
	git/gitconfig
	zsh/zshrc