Lots of vim improvements