Add vim-scala and paredit