merge
Merge branch 'master' of github.com:joeljackson/tcp_tests
adds osx support to the client