Added scala support to vim
Merged