Try matching uploaded file type before defaulting to first official one
Merge branch 'master' of https://github.com/zmillman/paperclip