I want to put together a fairly comprehensive toolkit to work on both vintage and modern bikes (I just started buying bikes on CL, fixing them up and reselling them). These are the tools I have so far:

Tire levers, air pump, 15mm/pedal wrench, adjustable wrenches, allen keys, cable cutter, chain tool, spoke wrenches

This is what I'm considering getting:

Chain whip, cone wrenches, crank puller, bottom bracket wrench, fourth hand tool.

Anything else I should be getting? I'm probably going to buy from niagaracycle.com, they seem to have the best prices and selection.