Add test for Content Negotiation.
Merge branch 'master' into maki.ericmartindale.com