Kershaw inks two-year deal, avoids hearing