make test conf files valid json, remove old master conf file
Merge branch 'master' of github.com:mmaisel/dirsync