Use $GNUPGHOME if it exists
[Fix #732] Replace $GREP_OPTIONS with an alias
Upstream update.
Better prompt.