Replaced vim-powerline with vim-airline
Merge branch 'master' of github.com:syranez/.vim

Conflicts:
	vundle.vim