Track the example conf files
Merge branch 'master' into devel

Include the gitignore update in master.