Fix spiff merge on properties.cf
Update README.md
Merge branch 'pinot-deployed'

Conflicts:
	README.md