Move as much as possible to the vim plugin for ease of sharing