added PGP user id settings to config.py, and updated readme
Refactor bot.py to be more friendly to testing
if a keypair with the user ID specified in config.py isn't in the homedir it generates it
Merge branch 'build-testing'

Conflicts:
	bot.py
Merge branch 'genkey'