updated for extra O/A round
updated references
fix up nits
fix up long lines
Merge branch 'master' of github.com:fluffy/ietf