Updat surround plugin and fixed up vimrc spacing and statusline