Refactor dev and prod pillar into one area
Update nginx configuration and plone for Shibboleth and www public site