Vimannot

Various tweaks to generate proper .vim.annot files without overlapping annotations, etc.