Add vim-surround
Move i3bar-mux into submodule