Incorporate recent puppet-hilary nginx.conf changes

Bringing the 3akai-ux nginx.conf file in sync (where appropriate) with the puppet-hilary 3akai-ux file