use good looking vim airline theme
play with UNITE and some other new vim script
Disable automatic rebase when pulling with git

Conflicts:
	bin/setup-gitconfig