Incorporate Erik's feedback.
Merge branch 'master' of https://github.com/mnot/I-D

Conflicts:
	http-problem/draft-nottingham-http-problem-03.xml