[vim] Added vim-surround
[vim] Scrollbar improvements
[bash] Make git ps1 work with newer git