The Neron-Tate height on elliptic curves