Tune the varnish cache
Update hosts
Manual merge with upstream
Use the www version for now