Remove obsolete key bindings
Merge branch 'master' of github.com:matze/configs
Merge branch 'master' of github.com:matze/configs

Conflicts:
	.vimrc