The Geodesic Ray Transform on Riemannian Surfaces with Conjugate Points