Prezto: merge in upstream
Remove unused lines in pentadactylrc