Squashed 'vim/bundle/vim-airline/' content from commit 799e5e0

git-subtree-dir: vim/bundle/vim-airline
git-subtree-split: 799e5e028fc48f8035cabef1eb92b02a2d52cbfa
Merge commit '40fde1d8a3f2d123f61c3d56b6c52e8592471cc3' as 'vim/bundle/vim-airline'
Merge branch 'master' into vim-airline
Changed airline theme for vim.
Merge branch 'master' into vim-airline

Conflicts:
	vimrc
Added mergeconflit related files to .gitignore.