Fixed bugs found in config.py.template while in PR 12.
Merge branch 'master' into kvdatatest

Conflicts:
	config/config.py.template
Added log4j.properties to streaming-test