GM and UAW do a deal