widened range of "valid" mime-types for certain MS Office file types
corrected mime-type for .ppa files for display.
Merge pull request #71 from ucsflibtopfstedt/rb2.2

more filetype/mimetype mapping fixes
Merge pull request #72 from ilios/rb2.2

reintegrate release branch
Merge branch 'master' into ilios-tests