Fixed wait_for_ssh to prevent invalid socket state
Remove original/extraneous socket declaration
Merge pull request #402 from whodatninja/develop

Fixed wait_for_ssh to prevent invalid socket state