Vim cleanup and add OS switches"