Started to make changes for our new system-specific config.
Merge branch 'master' of https://github.com/schallagit/csync