Hopefully fix issue with cluster miscounting
Merge branch 'master' of https://github.com/somerandomsequence/falling-fruit
A couple changes necessitated on go-live of these features. Mostly mailer fixes.