Switch back to mainline vim-vroom