remove a whole bunch of observace logic from the event decorator
Add EventDecorator#with_upcoming_observance
fix view specs that use logic moved out of event decorator