Return to using upstream vim-scala