Merge pull request #24 from mozilla-services/dev

Dev - 2014-04-23
marketplace: whitelist /fireplace/collection/ in marketplace cdn nginx config.
zamboni/settings: default to settings_mkt
marketplace/ports: add payments-bango-zamboni
solitude: add nginx_port option
remove unused define
solitude: add nginx_port option
remove unused nginx conf