Fixes for evil-surround

- Use MELPA package
- Update evil