remove vim-surround, add it as submodule
remove matchit, move it to a script
tune up tmux.conf