Add delays in test_connect_rid to allow time for socket to close before address reuse.
Fix tabs
Merge pull request #930 from ricnewton/master

Add delays in test_connect_rid