Removed excessive media types
Overhauled media types to allow charsets
Updated code to use new media type defs