Updated vim-scala & fixing snippets formatting