sync with zprezto master