merging in vim-annot stuff