Statistical Review of World Energy (BP)

This dataset comes from British Petroleum and it covers energy production, consumption, and trade by types of energy. Annual data by country and energy type is available; some dates from the 1960s.

http://www.bp.com/statisticalreview