Remove nerdcommenter, add vim-commentary + delimitmate