Add surround.vim
Remove gpg-agent from xinitrc.
Randomize m2a.