More evil-* loading tweaks
Evil-surround is not in elpa so we have to pull it from git
Move stuff to package dir