Commit before pull
Merge remote-tracking branch 'origin/master'

Conflicts:
	config/default.json
	enricher.js
Latest changes which include the addition of the json2jsonPush call and
the redis calls