Re-organize vimrc and add a few more shortcuts