Updated to python-gnupg 0.3.4, Ensure shelve directory is created, some further coverage tests.
Ensure test saved files are in their own directories. Ensure '-update-timestamp' services aren't directly editable.
Updates to relative location of files in start.sh script.
Changes to allow santiago_run.py to run correctly.
Merge remote-tracking branch 'upstream/master'

Conflicts:
	src/santiago.py
	src/santiago_run.py
	start.sh
Fixes/changes to test to reflect latest changes.
Tests for Cli connectors & move to twisted matrix for these servers.
Merge branch 'master' of github.com:tomgalloway/FreedomBuddy

Conflicts:
	src/connectors/cli/controller.py
	src/santiago.py
	unit_test.sh
Extra tests for CLI connector
Merge remote-tracking branch 'upstream/master'

Conflicts:
	makefile
	src/connectors/cli/controller.py
	start.sh
Revert python-gnupg change as doesn't handle KEYREVOKED status.
Updated tests to run with new python-gnupg version.
Set makefile to use my repository for python-gnupg until pull request for revoked keys is merged into master.
Require python-contract.  It's wonderful!
Added TODOs.
Removed completed tasks.
Refmormatted comments.
At least 3 of 4 fixes have been implemented for this issue.
Merged Tom's latest changes.