Add self.waiver in EventConfig model
Merge remote-tracking branch 'scott/master'