Added vim-scala to vam
Merge branch 'master' of github.com:joninvski/vim