Adds vim-airline
Merge branch 'master'

Conflicts:
	vimrc