F* mini pumps. My pumps are as big as the frame will allow them to be. I'm a fan of Zefal pumps.
My repair kit also has a few valve guts and the tool for it. One more thing you should carry, a piece of canvas. If you slash your sidewall you would not be able to repair or replace the tube because it would pop at the gash unless you wrap it in said canvas.