GPG signing
fix git_prompt_info
back to mvim, other .zsrhc tweaks
S3 directory upload script: don't prepend files/ to uploaded directories
Merge remote-tracking branch 'origin/master'

Conflicts:
	.zshrc