added surround and vimx
Merge branch 'master' of github.com:lmcdougall/dotvim
merging