Prezto: merge upstream and update external modules