Fix switching servers for clients
Merge pull request #43 from groupon/doug/clientfix

merged