Merge pull request #191 from mozilla/issue-186-mismatch-expose-error

Adding OpenID returned mismatching email addresses to error screen.
Merge branch 'train-2013.01.17' of github.com:mozilla/browserid-bigtent into issue-216-pin-flow