Move some nginx config to nginx-extra.conf file to avoid conflicts with aegir supplied nginx conf
Remove tweaks to aegir nginx conf in favour of modifying main nginx.conf