Bringing 3akai-ux nginx.conf file in sync with puppet-hilary 3akai-ux file
Merge branch 'master' into nginx-puppet-sync
Moved documentation around
Merge pull request #3171 from nicolaasmatthijs/nginx-puppet-sync

Incorporate recent puppet-hilary nginx.conf changes