After two years of negotiations and many contentious episodes, the civic tech nonprofit and its union reached an agreement on new benefits.