The Citi Double Cash may also be worth looking at. It's effectively 2% on everything (though it's 1% when you purchase, and 1% more when you make a payment). Since you're paying it off every month anyway, it's basically 2%. I just got one, but haven't been through a full billing cycle yet, so I can't officially recommend it until then. If it sucks I'll come back and complain about it! It's worth at least comparing to Fidelity's 2% card, which I think requires a separate Fidelity account to deposit rewards into (ie: you can't just get a statement credit, but I could be wrong about that).
Right now I have:
1) Citi Double Cash - primary card for almost everything (2% on everything, but 3% foreign transaction fees)
2) Bank Americard Cash Rewards - for gas only (though rare now since I bike everywhere) (3% gas, 2% groceries, 1% everything else)
3) Capital One Quicksilver - for travel (1.5% on everything, but 0% foreign transaction fees)
Make sure you look at the details closely when you apply. For example, the Quicksilver card has at least two varieties - one with a Visa logo that has no annual fee, and one with a MasterCard logo that does have an annual fee (depends on your credit rating). Others may be similar.