Lots of vim updates