TASK-8: Properly clean up sockets, no more duplicate sockets
Merge pull request #26 from DanLatimer/topic/TASK-8

TASK-8: Properly clean up sockets, no more duplicate sockets