Measuring Energy Security: Trends in the Diversification of Oil and Natural Gas Supplies