update airline colorscheme and diff options.
Merge branch 'master' of https://github.com/0xBADDCAFE/.vim