Updated vim settings (again). Using MitchellH vim settings as base.