Ok, your going to get very confused by all the advice, so here's one more to add to the confusion!

Personally I like frame pumps because they can pump to higher pressure faster then a mini; I own both but only take the mini on trips less than 75 miles because I ride on Specialize Armadillo's thus flats are very rare. The mini I carry is the smallest lightest mini on the market, it's a Torelli Aria and clips onto the side of a water bottle cage or fit's into a seat bag or jersey pocket or CamelBack pocket. I've used the mini and yes it does take quite a few pumps but your not sitting there pumping and watching the sun set! Probably takes about 45 pumps to get the pressure to 80psi.

Tool wise is weird for me because I ride in remote areas and don't like to be dependent on my wife to come get me should something happen if at all possible. So I carry a Park MTB1 (they now have a better one called MTB3); this thing has about 21 different tools in it...but I ride a road bike and the included tire levers are too wide because it was made for a MTB. So I also carry 2 tire irons, a Quik Stik (that removes tires fast) and a VAR tire tool that allow me to be able to put on that last inch of the very stiff Armadillo tires without worrying about damaging the rim, tire or tube doing it. I also carry a cheap Walmart Eddie Bower (sp?) mini tool that has a pair of needle nose pliers that fold up very small. That's it for tools.

I also carry a glueless patches because they work just as good as the glue type without the glue step and wait to dry time, and no worries about finding a dried glue tube; and a tire boot. I also carry a spare tube, spare ultralight racing tire, extra batteries for the rear tail light and computer, $25 cash (for food or some sort of emergency), some first aide stuff like bandaides, a gauze pad, ointment, and alcohol wipes; photo ID; and a key to get into the house.