Update README.md
misc edits
merge ...
Merge branch 'master' of https://github.com/ranjitjhala/vim-annotations
Merge pull request #2 from ranjitjhala/master

Misc bug fixes