Stylistic improvements; Added Vim-surround plugin