Enable cindent, with shiftwidth=4.
Merge branch 'master' of github.com:congyue/vim

Conflicts:
	.vimrc