Merge zprezto from upstream