various edits
Merge branch 'ben-work-in-progress'

Conflicts:
	draft-donovan-doic-endpoints-00.xml
Merge branch 'master' into ben-work-in-progress