Picked up a couple protected, 3.7V 2400mAh 18650 cells:
and a charger:
Charger will also charge RCR123 cells, so I can pick those up if I end up with a flashlight that uses them.
Also got a couple cheapie flashlights for around the house:
Now... I just have to wait for everything to take the slow boat over from china. Should be here within 2 weeks or so. Can't wait!!