Update mercurial keyring
Merge branch 'master' of github.com:zorfling/dotfiles