Added powerline and vim-surround.