Fix startup bugs

I'm running Emacs 24.3.91 on OSX. I had crashes starting-up from two packages being misnamed. It seems that `surround` should be `evil-surroun` and `vagrant-tramp` should be `vagrant`