revised masterSync, working on git integration
Merge branch 'master' of https://github.com/mmaisel/dirsync