Carnegie Mellon University is making hydrogen the most probable replacement to gasoline by increasing hydrogen's stability and reducing its costs. According to Professor David Sholl of Carnegie Mellon's chemical engineering department:

"...We are currently studying the use of metal hydrides, such as alanates and borohydrides, to find materials that could ultimately improve the efficiency of hydrogen cars and curb pollution. Hydrogen can potentially be produced from domestic resources without emitting carbon dioxide into the atmosphere, which is an attractive vision for a future fuel source..."

And this is all geared towards finding a material that will store hydrogen in a compressed gas tank but convenient enough to be used for fuel cells, and with so much work on hydrogen such as this I would not be surprised to wake up to a hydrogen economy soon.