Remove merge conflict
Fixed a few errors in the TcpClient so it works out of the box
Merge pull request #27 from colinbull/master

Fixes a few small bugs with the tcp client
Update and rename README to README.md