Comment 2 for bug 632536

Notes for QA:

I'm going for a significant simplification of this view. All branding is being removed from the "Continue" page and the only thing you'll now see (if you disable js) is a continue button on a plain page. If you have js enabled, you won't see anything as it'll automatically redirect you back to the consumer.

I also fixed bug #680256 as part of this work, to make testing easier.