Observation of a large, resonant, cross-Kerr nonlinearity in a cold Rydberg gas and progress towards quantum non-demolition measurement of photon number