Hopefully not completely screwed up vim changes