Add back in nerdcommenter, vim-surround and vim-markdown