Revert "Puppet User France"

This reverts commit e37db427d1167cb0514a67b9d2250cffebec5f29.
Revert "Revert "Puppet User France""

This reverts commit 026e28fbd071d554dc5c20c2a225b2a865787de3.
Merge branch 'master' into gh-pages