Add vim-surround
Fix trailing whitespace