Aldo postpones retirement, signs new UFC deal