Switched to better buffer usage (vs tabs)
And included vim-airline
Merge remote-tracking branch 'origin/master'

Conflicts:
	.gitmodules