Tomorrow's Energy, revised and expanded edition