add vim-airline plugin
Merge branch 'master' of https://github.com/sschicketanz/dotfiles

Conflicts:
	.gitmodules
some settings for vim-airline