Clean up horrendously messy nginx config
Make changes requested by Philippe to brand rewrite