vim: Add vim-scala.
zsh: Undo that stupid umask thing.