new billing config on payments-alt (bug 937701-payments-alt)
Merge pull request #260 from andymckay/937701-payments-alt

new billing config on payments-alt (bug 937701-payments-alt)
turn on v2 billing (bug 1016112)
Merge pull request #263 from andymckay/1016112-stage

turn on v2 billing (bug 1016112)
Adding in the base models to make zippy products work, some fake urls we'll fix up when its ready.
Merge pull request #264 from andymckay/zippy-fixin

Zippy fixin
Store encrypted email on Buyer (Bug 1028994)

- Add encrypted field to model
- Add field to resource
- Update API tests
match ports up with marketplace docs
Merge pull request #265 from JaredKerim-Mozilla/1028994

    Store encrypted email on Buyer (Bug 1028994)
bump test-utils
make a mashup resource thats part solitude part zippy
feedback from @jaredkerim
update docs
Merge pull request #266 from andymckay/zippy-fixin

make a mashup resource thats part solitude part zippy
remove the need for settings/local.py (bug 1021991)
zippy settings
correct default port
mstriemer feedback