configuration snippets in seperate files
Merge branch 'confsnippets'