Fix bash completion, add zsh completion, release 2

calibre is run in %install, so promote all R to BR.