Incorporate proper fix for vim-scala bug

https://github.com/derekwyatt/vim-scala/pull/36