Richard Wheeldon's review
Merge branch 'master' of https://github.com/http2/http2-spec

Conflicts:
	draft-ietf-httpbis-http2.xml

Did some necessary reformatting.