I suppose it's my turn to link to another effort in this area, liquid salt batteries: http://www.ted.com/talks/donald_sadoway_the_missing_link_to_...
They have the advantage of being much cheaper to manufacture, but I don't know how their energy density stacks up.