`surround` seems to be called `evil-surround` now
vagrant-tramp should be vagrant
Merge commit 'c233b225082f68e0b7343bb5cf6bf73cb14d51f4'