Merge pull request #3079 from seanfahey/develop

Added MIME types for .ppt uploads