More networking fixes.
Fix windows build?
Merge pull request #3 from ethereum/develop

Update from upstream