switch back to rsync + fix service handling
Merge branch 'master' of github.com:geco2/helper