Simplify vim file type detection

This patch is from Fedora's GIT repository.