Yup. I was also saddened to see Hodor pass, but what a revelation.
Ramsey vs. Jon will happen in the last two episodes from what I've heard. Expect another Stark to die.