Update unite-outline
Install vim-airline
Fix conflicts