Add better handling for client sessions and rsync
Merge pull request #248 from emacsen/master

Add better handling for client sessions and rsync