updated josh
fixed conditional appearances
Fixed bartender reference in ch4
Merge pull request #519 from jcotrel/master

Fixed conditional appearances