I think, logically, you could fold Intimidate into Bluff. What's an intimidation other than the threat of violence? Sounds like a bluff to me, even if it just so happens to be one that most PC's could back up with the real thing if need be. Now, I wouldn't do that in a normal game, as Bluff...