Hides airline encoding info on smaller widths.
Merge branch 'master' of github.com:geoffholden/dotfiles

Conflicts:
	vimrc