run zamboni on 2600 by default (bug 1021991)
use a rocket if nothing else there (bug 1016671)
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)
Let's be nice and provide a default like Django's project template does
Merge pull request #2228 from twiss/manifest-cors

Allow CORS requests for mini manifests (bug 994423)
Added python packages for things that were in vendor
Merge pull request #2152 from twiss/update-landfill-urls

Update landfill urls
requirements: newrelic 2.16.0.12 -> 2.20.1.18