Merge branch 'master' into gurnet-server
basic threaded server working, but the thread test does not pass
removes unused code