[wip] work on episode content [ci skip]
Merge remote-tracking branch 'origin/master' into episode-content

Conflicts:
	app/models/show_episode.rb
	db/schema.rb
Programs template/controller cleanup
Merge remote-tracking branch 'origin/master' into episode-content
Revert segment -> content changes
More cleanup, work on tests [ci skip]
Merge remote-tracking branch 'origin/master' into program-template-cleanup
Fix some tests
Fix more tests
Merge remote-tracking branch 'origin/master' into program-template-cleanup
Fix episode list on program page
Merge pull request #196 from SCPR/program-template-cleanup

Program template cleanup