Use vim-airline for statusline
Merge branch 'master' of github.com:yzzyx/dotfiles

Conflicts:
	.vimrc