change future events copy on Forum page
update regular features' air times on program schedule
update Frame's podcast XML link to use the correct URL
accidentally included changes from WIP branch
The most insufferably pretentious underlines since the underline was invented.
add new feed for NPR One ingest; deprecate take_two feed
Merge branch 'master' of github.com:SCPR/SCPRv4
Add `collapse` option to ScheduleOccurrence.block

* Add optional third argument to `ScheduleOccurrence.block`. If true, collapse
  adjacent future instances of the same program into the first instance of the
  program.
* FIXME: This doesn't backfill instances that weren't specified in the time
  constraints of the block.
Take a brute force approach to collapsing full on-now schedule

Query eight hours on both sides of now. Reject all shows that already ended.
Use collapse flag in listen live's ScheduleOccurrence.block call
Fix test cases for collapsed schedules, and fix cases with no programs
ScheduleOccurrence: Fix the code to filter out overwritten instances
Merge branch 'master' into ElasticSearch