Some work on the NtpTimeKeeper

Some all-around cleanup/refactoring