Allow year to be supplied to print_holidays
Remove extras