Bug fixes and add socket time out.
Just a Merge of branch 'master' of https://github.com/ohearnk/CS467