Added an output module to log data to JSON files.
Added an output module to send data to an Elasticsearch install, so that the data can be viewed with Kibana.
Merge branch 'elasticsearch'

Conflicts:
	outputs.cfg