Merge pull request #585 from dimagi/billing-scrub-a-dub

Billing scrub a dub
Merge branch 'master' of github.com:dimagi/core-hq into scroll-fix