update keymap
update vimrc
Merge branch 'master' of github.com-hilr:hilr/vimrc

Conflicts:
	.vimrc