Use kdiff3 as git merge tool
Enable vim-airline's enhanced tabline