updated vim-scala plugin to 'derekwyatt/vim-scala'
Merge branch 'master' of https://github.com/martinblech/dotfiles