Refining the vim setup a little more here