When I was trying to decide whether to go mini pump or CO2 my father pointed out a problem, "...with CO2 you only get one good shot, so if you mess up you could be screwed"
I went to my LBS with this in mind and found a neat little CO2 that also had the manual pumping option...
It is: Genuine Innovations, SecondWind MTB C)2 Hybrid/ Compact air pump.

Have not had to use it yet but its small and out of the way for now