misc edits
merge ...
Merge branch 'master' of https://github.com/ranjitjhala/vim-annotations