minor scala oriented vim tweaks
Merge branch 'master' of https://github.com/JonathanFelch/linux-init