#2 is great. The typical "official" advice for salon tipping is 15%, unless it's the owner. Doormen get tips, concierges, cab drivers, etc.
I'm doing some work now (not restaurant work, but a gig I have at Universal Studios this summer) that confuses a lot of people. I will occasionally get no tips at all from very appreciative people, but today I made $85 in tips, ranging from $5 to $20 per couple or family. One day I made $143, though, including one Ben Franklin from some rich guy hailing from Hong Kong. Sometimes it comes down to what the service was worth to you.