Adds Affiliated promotion rule, removes kiss kiss bang bang
Merge branch 'master' into doorbot