Airline
Merge branch 'plugin'

Conflicts:
	.vimrc