Fixes #240

However, I would like to do a more thorough review of file types, so no pull req yet.
Merge pull request #254 from SpiderOak/issue-240-mime-types

Fixes #240