Add pillar merge (to set wsgi_conf)