Added vim-surround and html_autoclosetag