Adding Vim-Surround and Vim-Airline with proper terminal colours