rename some config files to *.conf.example

that way you do not get clashes with the real config files when deploying from a git checkout
Merge branch 'master' into graphs