Various vim updates