Deluxe Olive Salad