Each year now only has one Christmas vacation in order to simplify things... #44
Various diary bugs #44