Update completion options
Merge branch 'master' of github.com:joshaw/dotfiles2