fix line wrap in shell and some vim updates