Added a timeout when connecting to a new server.  Fixed a bug with server name validation.  Editing a server no longer requires the user to change the server's name.