I recommend the book Dealing with Difficult People by Rick Kirschner and Rick Brinkman - seriously, get it (the longer, not the shorter version) Hope your library has it maybe?

Willow, there's a definition of 'tank' in there, and how to deal with one (it was really helpful in dealing with my dad) - the 'tank' just yells and tries to 'bully' everyone into working/doing what he wishes, but you have to (respectfully) stand up to the tank and tell his or her behaviour (the yelling etc) has been just making things worse and minimizing productivity (or whatever the person cares about) But it's really well described in the book.

Growlycat, was the other guy 'only joking' or being a 'wiseguy'? - there are tips for that in the book too...