Sync prezto with upstream