Vim surround with reworking of commonly used surrounds