JA Happ agrees to deal to return to Yankees