Afghanistan inks peace deal with warlord ‘butcher of Kabul’