Merge branch 'master' of git://github.com/sorin-ionescu/prezto
Merge branch 'master' of github.com:Meroje/prezto
Completions update