Add vim-airline options
Merge branch 'master' of https://github.com/chrismcbride/dotfiles