Proper vim plugin structure, surround.vim added