Update keyring with sa2ajj key
Merge jollyroger/buildbot-infra:master (PR #4)