The issue of "tolerance" is addressed in another post, here. Essentially, to be tolerant of someone there has to be a disagreement in place. If you agree with someone's opinion, position, or behavior, then it is not "tolerance." It's just plain ol' agreement. Being tolerant has to do with how you treat people you have differences or disagreements with.
"Bigotry" similarly deals with how we relate to people who are different, or have different beliefs, than ourselves. According to Doctionary.com, a bigot is "