add price config
Merge branch 'master' into add_price_config
Merge pull request #35 from ooyala/add_price_config

Add price config