Add new commits from zprezto