What will replace oil?

This is a thoughtful and I think quite fair discussion of the prospects for energy production thirty years from now, when oil and gas will most certainly be largely phased out due to global warming concerns as well as supply issues. The author claims that without technological advancements related to storage and a new integrated energy grid that solar and wind are likely to produce only about 4% of world energy (from 1%) by 2041. Let's get going on that new energy grid!
http://www.salon.com/news/politics/war_room/2011/06/27/energy_future/index.html