Replaced mime-type with mime.
Added new lines.
Merged form upstream.
PR changes.
Spacing cleanup.
Merge pull request #1905 from arb/mime-db

Replaced mime-type with mime.