Issue #227: Moved management of content-type back into RiakObject