Disabled text=auto
Remove invisibles by default, added expand tabs
Merge remote-tracking branch 'origin/master'

Conflicts:
	.vimrc