Consolidate socket code
Merge branch 'master' of github.com:ShitWeDo/stimpy