Allow HTTP methods other than the standard ones.
Add CHANGES entry for #144
According to mirage/ocaml-conduit#6
Merge branch 'dinosaure-sockaddr' of git://github.com/dinosaure/ocaml-cohttp into dinosaure-dinosaure-sockaddr
Port to the latest Conduit 0.6.0 API.

This moves us towards a more flexible interface for listening on
non-traditional channels such as shared memory (by moving the
listening addresses and requested hostnames over to Conduit)
Add a `httpunix://` scheme to support HTTP over Unix domain sockets

This will be deprecated when we get more sophisticated support for
overriding name resolvers in Uri and Conduit, but for now is the
easiest way to support libraries like ocaml-docker that need to
resolve the host part of the schema as a file-path for a domain socket.
travis: pin conduit
travis: +ipaddr
Add `stop` thread to terminate a running server if it finishes.

Adapted from #147 from @dinosaure
Merge branch 'master' of git://github.com/nojb/ocaml-cohttp into dinosaure-dinosaure-sockaddr
sync changes
Fix #142: update the Code generator script
sync CHANGES
Merge branch 'master' of github.com:mirage/ocaml-cohttp
Merge branch 'master' of github.com:mirage/ocaml-cohttp

Conflicts:
	CHANGES
Merge branch 'dinosaure-dinosaure-sockaddr' into conduit-0.6

Conflicts:
	CHANGES
	bin/cohttp_server_lwt.ml
	setup.ml
Lwt: use the Conduit resolver API
Async: put in a temporary Unix resolver here until Async_resolver works
add oasis dependency on the right conduit lwt unix library
fixup test cases for new APIs