vim: added vim-surround, reordered plug-ins