Resolving the Tension Between Salvation and Social Justice