Embedded lock in history struct and fixed default --identity key location

Which looks more cleaner? I don't want the user to have to guess where we're going to load ssh keys if it's not specified.