Cleaned submodules
Updated vim-scala