Autocomplete

Hi,

I wanted to add autocomplete for `zsh`. I didn't realise you already had an `autocomplete` branch when I did it, which is why this pull request also brings this branch up to date with `master`.

Thanks,

Toby