Various vim changes