Switched calendar_helper to use Time.current instead of Time.now so it works properly
with timezones