adding vim-scala, plus a few small tweaks