Improved reporting of server connection errors.

The timeout for a server connection can now be specified. diffManifests() will now catch an exception if it can't connect to the server and updateManifest() will return False.

All instances of <code>file</code> and <code>dir</code> were changed to f and d, respectively. File and dir are reserved words.