Merge pull request #32 from Silex/master

Rename surround.el to evil-surround.el
Fix forgotten leftovers when renaming