removed old surround bundle, modified vimrc