Fix evil-surround and .gitignore