"merge episodes" setting now affects /feed

fixes #290
fixes #395