Update landfill urls
Add --site option to install_landfill
Merge branch 'master' of https://github.com/mozilla/zamboni into update-landfill-urls

Conflicts:
	apps/amo/management/commands/install_landfill.py
run zamboni on 2600 by default (bug 1021991)
use a rocket if nothing else there (bug 1016671)
Revert "Add --site option to install_landfill"

This reverts commit 232250ceba5a751408f4b5888103791779a033d4.
Remove references to addons landfill URL
upgrade to django-browserid 0.10.1 (bug 846349)
Fixed migration to remove rows before deleting the column
add id to simplepreviewserializer for transonic
log_settings: z.geoip log level to WARNING

z.geoip on info logs every geodude lookup.
Bump app-validator
Merge pull request #2227 from oremj/geoip-log-level

log_settings: z.geoip log level to WARNING
Merge pull request #2225 from robhudson/migration-fix

Fixed migration to remove rows before deleting the column
Merge pull request #2226 from ngokevin/master

add id to simplepreviewserializer for transonic
fix preview test
make admin usable again (bug 1026818)
Allow CORS requests for packaged apps' zip files
Allow CORS requests for mini manifests
Removed some old hackery in manage.py (bug 1021033)