General vim improvements