Elliptic Curves, Modular Forms and p-adic Heights