Update README.markdown

fixed typo (or perhaps changed syntax) for Surround quick help
Merge pull request #485 from aauthor/sd-typo_fix

Update README.markdown
Merge branch 'upstream-3.0' into 3.0
Switch from `vim-handlebars` to `mustache/vim-mode`

`nono/vim-handlebars` is deprecated.