add tab width and lower font size
Merge branch 'master' of github.com:hbussell/vim

Conflicts:
	.vimrc