Add vim-lion, remove vim-expand-region