Pass the current available server along so we connect to that specifically

This will allow us to not have to change @servers.
Noting Darcy's contribution.
Merge remote-tracking branch 'ngan/failover_fix'
Fixing escape.

No need to escape most characters in strings, just in regexes, which meant my tests were wrong.