Fixed evil-surround inconsistency
Merge branch 'master' of github.com:Tritlo/spacemacs into minn