Made a pass at media_type collections.

Signed-off-by: Josep M. Blanquer <blanquer@rightscale.com>