Tweaked the content negotiation work in progress a bit more and put in some references.