Merge pull request #71 from ucsflibtopfstedt/rb2.2

more filetype/mimetype mapping fixes