Use latest customizations from by prezto fork