Adding Scala support
Merge branch 'master' of https://github.com/felipedjinn/vim
Adding Scala support