A bunch of vim changes