Merge pull request #184 from steinernein/dev-sockets

Retrying
.
Nothing
Sync mostly done
Merge branch 'dev-sockets' of https://github.com/satellite-game/Satellite into dev-sockets
Fixing merge conflicts -- aka sync