Explicitly add paredit-mode hooks
Fix evil-surround-mode config