reverting back to the 4 media types
updated media type registrations based on RFC6838

minor changes to media type registration based on the new template in
RFC6838. It replaces the template in RFC4288.