Fix several issues with gitpuppet's keypair

Change-Id: I951de369d5cac18e816684daf1f7913d99fe7d36