update lancome config
Merge branch 'master' of https://github.com/ericstone57/nurun-site-build

Conflicts:
	modules/lancome-efforless-chic/templates/nginx-uat.erb