Merge pull request #2 from ranjitjhala/master

Misc bug fixes
ASDASD
asdasd

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