vimrc cleanup and vim surround added