Following nearly four decades of conflict, the death of UNITA leader Jonas Savimbi on Friday offers a window for peace in Angola in which to address the role of oil and diamonds in funding the civil war.