Slowed down the step to 2 seconds. Moved socket and connection timeouts to constants.
Explicit port number in server.
Merge branch 'master' into better-client

Explicit ftw.