Poll socket until messages come through
Merge branch 'master' of github.com:faiq/distributedfiles