Roll back vim-scala a few commmitts

Since the indentation got broken somewhere after
1b154bab421b8cf71a417023518d7cb5e330db8a