Adding text/html mime types
Merge branch 'mime-sniffing' of github.com:IdeaHat/servo into ideaHat-mime-sniffing

Conflicts:
	components/net/mime_classifier.rs
Merge with ideaHat-mime-sniffing