Don't bother with fillchars
Ignore whitespace when diffing with Vim
Bring back vim-scala