Merge pull request #193 from mdlayher/master

Add .ico and image/x-icon to known file and mime types