Speaking of batteries … this arrived today, courtesy of Tenergy. Woo!
Nice! I need a battery hook up 
Two pieces of wires, preferably one red and one black, bit of solder, hot iron … hookup done. 
Do you run protected cells? Or do you let your charging circuit take care of that for you?
Charging circuit handles the charging part as far as stopping at 4.2V, and software cuts off if the voltage drops below 2.8V (since the LPDs stop at 2.7V.)