On Calvin and the diaconate, I would recommend in particular two books -- Richard Gamble, Calvin's Ecclesiology : Sacraments & Deacons and Elsie Anne McKee, John Calvin on the diaconate and liturgical almsgiving -- and one article, David Apple, The Role of the Deacon.