updating repos
Merge branch 'master' of github.com:edap/Dotfiles
adding vim-surround
fix merge conflict
clean up plugin