Fixing dumb merge crap.
New function for doing updates.
Binding M-Z to zap-up-to-char.