Added vim-airline.
Merge branch 'master' into mac