vim: reorg some stuff, add surround, cleanup