pull logstash
Merge branch 'master' of github.com:SmartReceipt/salt

Conflicts:
	logstash
pull logstash