Merge branch 'keymap.fix' into dev
Merge branch 'dev' of github.com:huangyingw/vimrc into dev