cvs update to 2014-01-14, keep conflicts
resolve conflicts; pull ssh-ed25519.c from current

pulls some key related changes from af3467958044d2aeccb23