Merge pull request #10 from bwinterling/guest-billing

Implement guest billing
Merge branch 'master' into guest-billing