Rename evil-surround due to upstream changing.
Merge pull request #575 from lazywei/upstream-master

Rename evil-surround due to upstream changing.
Pull in upstream changes