I carry all my tools, tube, etc in a Pro storage bottle. http://www.probikekit.com/display.php?code=NP07739

Most of my rides have easy access to refill my water bottle so only one is necessary. If I need 2 bottles, I put the storage bottle in my jersey pocket and a second bottle on the bike.