Changed a bunch of vim stuff