Fix incorrect output with double bank holidays

Fixes the issue raised here:
https://github.com/alphagov/calendars/issues/73

Notes the difference between bank holidays and holidays by proclamation