Fix for vim surround / yankstack conflicting