(NginxReview) Merging nginx config between puppet and 3akai-ux template
Merge branch 'nginx-sync' of git://github.com/mrvisser/3akai-ux into nginx-sync
Small follow-up ordering fix