Local tardisd.cfg
Merge branch 'master' of https://github.com/koldinger/Tardis

Conflicts:
	tardisd.cfg
Merge branch 'master' of https://github.com/koldinger/Tardis

Conflicts:
	tardisd.cfg
Merge branch 'master' of https://github.com/koldinger/Tardis
Merge ssh://linux.local/srv/GITROOT/Tardis
Merge branch 'master' of https://github.com/koldinger/Tardis
Merge branch 'master' of https://github.com/koldinger/Tardis
Merge branch 'master' of https://github.com/koldinger/Tardis
Merge branch 'master' of https://github.com/koldinger/Tardis
Simple logging changes.  Make the verobsity a bit cleaner.
Merge https://github.com/koldinger/Tardis
Merge branch 'master' of https://github.com/koldinger/Tardis
Merge branch 'master' of https://github.com/koldinger/Tardis

Conflicts:
	Tardis/TardisClient.py
Converted to using a SHA1 hash on the password for better security.  Now can't send the token from the DB and expect to authenticate.
Fixed starting the local server and specifying the port on the command line.
Changed a log message in the client.
Merge ssh://linux.koldware.com:99/srv/GITROOT/Tardis
Catch signature errors and fall back on sending full content.
Added argument on the command line for port number.
Cleaned up some help messages.  No functional change.
Fixed the default name for the database.  Don't try to set times or permissions on stdout.