Fixed three tests, changed in sockets.py
Merge branch 'master' of github.com:courageousillumination/deckr