Merge in changes from curry package "socket"

Together with kics2!2 (merged) this fixes the issues with network-3.0.0 in ghc >= 7.8

"cypm update" worked just fine, so it seems like everything is working correctly