Boil potatoes until fork inserts easily. Drain and set aside to cool.
In a medium bowl, combine remaining ingredients and stir well.
In large bowl, cut potatoes into 1/2-inch cubes (skins can be removed or leave on). Pour mixture of ingredients over potatoes and stir. Cover and chill to blend flavors. Before serving, garnish with cilantro or chives.