airline no longer uses patched font
Merge branch 'master' of http://github.com/jporsay/dotfiles

Conflicts:
	vim/rc/pluginconf.vim