Add check during initial handshake whether we already have an established connection to this peer
squash two ifs together
Merge pull request #184 from bboreham/182_unstable_connections

Extra check for duplicate connection

Fixes #182.