Kevin Durant re-ups with Warriors on discount deal