Merge pull request #27 from mozilla-services/dev

Dev - 2014-05-06
nginx: update logrotate.
nginx: update nginx.logshipper to cleanup up logs older than 14 days.
Merge pull request #28 from mozilla-services/dev

Dev - 2014-05-13
marketplace/solitude: default deploy_settings to undef.
base: add base::packages::admin
marketplace/solitude: update settings template variable access to remove deprecated warnings.
marketplace/nginx: update blocklist to redirect blocked info back to amo.
marketplace/nginx: test blocklist path.
marketplace/nginx: update blocklist to 301 rest of traffic back to amo.