Fix to handle nested hashes in logstash.conf
Merge remote-tracking branch 'upstream/master' into nested_hash_config
Resolving merge conflict
Conflicts:
	libraries/logstash_conf.rb
Merge pull request #266 from pulseenergy/nested_hash_config

Fix to handle nested hashes in logstash.conf