Merge pull request #1519 from nhenezi/mime_type-improvements

mime_types now behaves as wrapper for mimetypes.