Moved holiday_observed_on outside of suggested_vacation_days. And made an exception for christmas.
Merge branch 'development'