Merge pull request #333 from cpoulain/master

Update template for local configuration settings