regular is good, holidays by date
update for holiday
correct number of fields
Merge pull request #61 from Trott/rename-service-ids

Rename service ids