Scala enhancements.
Merge branch 'master' of github.com:psosera/dotvim