added some more socket stuff
cleaning up
Merge branch 'master' of github.com:beachygreg/zapoc