Warming to lithium-ion, Toyota charges up its battery options