Add smartindent
Merge branch 'mac' of github.com:keyvanfatehi/config into mac

Conflicts:
	.vimrc