Merged in editorial-fixes (pull request #195)
https://bitbucket.org/openid/fapi/issues/303/proof-read-parts-1-and-2
https://bitbucket.org/openid/fapi/issues/303/proof-read-parts-1-and-2