some fixes
Merge remote-tracking branch 'origin/storagecleanup' into storagecleanup

Conflicts:
	importer/hadoop-json/conf/twitter_carsten_home.json