Merge pull request #647 from nsendetzky/master

Uses attr-{list,item} instead of coupon-{list,item}