removing couchlog special handling since settingshelper does the split automatically Merge branch 'master' into newprod
removing couchlog special handling since settingshelper does the split automatically
Merge branch 'master' into newprod

Conflicts:
	fabfile.py
	settings.py
	submodules/casexml-src
	submodules/core-hq-src
	submodules/couchexport-src
	submodules/couchforms-src
	submodules/formdesigner
	submodules/hq-bootstrap
	submodules/hsph-reports
	submodules/touchforms-src

qedsoftware/commcare-hq,puttarajubr/commcare-hq,SEL-Columbia/commcare-hq,qedsoftware/commcare-hq,SEL-Columbia/commcare-hq,dimagi/commcare-hq,gmimano/commcaretest,qedsoftware/commcare-hq,puttarajubr/commcare-hq,dimagi/commcare-hq,qedsoftware/commcare-hq,qedsoftware/commcare-hq,puttarajubr/commcare-hq,dimagi/commcare-hq,gmimano/commcaretest,puttarajubr/commcare-hq,SEL-Columbia/commcare-hq,gmimano/commcaretest,dimagi/commcare-hq,dimagi/commcare-hq