Learning the Skills of Peacemaking, Revised and Expanded