fix hot key conflict
Merge branch 'master' of github.com:zjmdp/Vim-Config