adjust pricing
Merge pull request #127 from openplans/pricing

Adjust pricing
Merge pull request #128 from openplans/staging

Merge new pricing work into master