Update gpg-bootstrap. Make a bit cleaner