Some code formating
Fix error where we weren't correctly deleting files form slave on full rsync, even of configured to do so
Some refactoring to simplify future work