Modifying setup script
Merge branch 'master' of https://github.com/bcarls/vim_config
Adding buffer stuff