Collector tuning
Collector tuning
Merge origin/master

Conflicts:
	aidr-collector/src/main/java/qa/qcri/aidr/collector/collectors/TwitterStreamTracker.java