Updating 'Trends in Global Energy Use'