changes to support git colour prompts and dir trimming
gpg updates
Merge branch 'master' of https://github.com/ryazwinski/Config-Files

Conflicts:
	.gnupg/pubring.gpg
	.gnupg/pubring.gpg~
	.gnupg/random_seed
	.gnupg/trustdb.gpg
	.profile