added vim-airline
Merge branch 'master' of github.com:russellholt/dot

Conflicts:
	.gitmodules