Merge new changes from upstream prezto

That is all.