Contours of Climate Justice: Ideas for shaping new climate and energy politics