Corrected bug where holiday_observed_on function was not being used. Also added personal dates into the mix.
Removed number_of_vacation_days.
Merge branch 'development'