I also used to carry a portable shop in my tool roll along with the cell phone, credit card, and roadside assistance card. Now on trips I just carry a few things...enough tools to access the battery, because you can take out the battery and get a ride to a dealer and chances are good you can get a battery since our Yuasa is available on other makes and models. I saw Dwight get a battery for his Triumph Sprint in Prescott at a really small non-Triumph dealer only about a mile or so from his house.
I also carry a small multimeter, fuses, and wire repair kit. It'd be a shame to be stuck somewhere for something simple like a faulty sidestand switch when you can bypass it easily with some wire. The only other tools I carry are sockets to get the saddlebag brackets off. When I get to a destination, and want to go for a day ride, I like to strip the bike down and leave the saddlebags and windshield back at the hotel room. Budweiser in Albuquerque has seen me do that one when I went there last September.
