Use Airline instead of Powerline.
Merge branch 'master' of https://github.com/mudge/dotfiles

Conflicts:
	.vimrc