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

Rename evil-surround due to upstream changing.
Merge remote-tracking branch 'upstream/master'
Use default theme and font