Why does my crystal oscillator spike so much?
Most important thing is to compensate your Oscilloscope probe. This may account for the overshoot. - - - 
  Second, Conner Wolf is correct in the ground lead of the probe. I don't know how many times my technicians had problems, and I simply gave them a shorter ground clip lead and magically the ringing disappeared.