In a medium saucepan, bring 5 cups of salted water to a boil, with 1 tbsp of olive oil. Add pasta and cook per directions on package (8-11 minutes). Drain, and run pasta under cool water to rinse. Add drained pasta to a large bowl, and combine with all other ingredients. Toss, and chill 1 hour prior to serving.