Next time I need to get one I may just make my own kit, like this:

http://www.instructables.com/id/Bicycle-Mini-Tool-Kit/