Merge branch 'master' into service_test

Conflicts:
	blank.log
no blank log please
Updated Twitter Harvester to make it less aggressive with storage.
Merge branch 'master' into service_test

Conflicts:
	blank.log
 Merge branch 'service_test' of https://github.com/sociam/indx into service_test

Conflicts:
	blank.log
merging in service test

Merge branch 'service_test' into es
commented out annoying comment