Shell completion

I took a stab at fixing up the shell completion stuff so it matches current usage. I wanted to fix the zsh version too, but only tested it superficially (I use bash), so that might warrant a second look.

Thanks for the project. Cheers!