add vim-airline plugin
Merge branch 'master' of github.com:greg0ire/dotvim

Conflicts:
	.gitmodules