Make pki and pkr use local installation where needed
Merge branch 'master' of github.com:embolalia/dotfiles