The global energy market was thrown into disarray this year, with a widely expected oil glut erased by the Iran conflict.