Vim changes I haven't pushed in forever