Add `immediate`, `trust_root` options
Merge branch 'rack/open_id/more_build_header'